use CHILD_VISIBLE instead of VISIBLE to determine whether we should stop

Sat Dec 27 23:17:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE
	instead of VISIBLE to determine whether we should stop
	sliding. (#130018, reported by Christian Persch).

diff --git a/ChangeLog b/ChangeLog
index c6f46063fcf138fdd73a6b6124cda48def9b92b1..afc77d985111d6a11fdb65783e2aa967cb242cd9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec 27 23:17:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE
+       instead of VISIBLE to determine whether we should stop
+       sliding. (#130018, reported by Christian Persch).
+
 Fri Dec 26 23:24:35 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c6f46063fcf138fdd73a6b6124cda48def9b92b1..afc77d985111d6a11fdb65783e2aa967cb242cd9 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Sat Dec 27 23:17:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE
+       instead of VISIBLE to determine whether we should stop
+       sliding. (#130018, reported by Christian Persch).
+
 Fri Dec 26 23:24:35 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c6f46063fcf138fdd73a6b6124cda48def9b92b1..afc77d985111d6a11fdb65783e2aa967cb242cd9 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Sat Dec 27 23:17:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE
+       instead of VISIBLE to determine whether we should stop
+       sliding. (#130018, reported by Christian Persch).
+
 Fri Dec 26 23:24:35 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c6f46063fcf138fdd73a6b6124cda48def9b92b1..afc77d985111d6a11fdb65783e2aa967cb242cd9 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Sat Dec 27 23:17:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE
+       instead of VISIBLE to determine whether we should stop
+       sliding. (#130018, reported by Christian Persch).
+
 Fri Dec 26 23:24:35 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c6f46063fcf138fdd73a6b6124cda48def9b92b1..afc77d985111d6a11fdb65783e2aa967cb242cd9 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Sat Dec 27 23:17:56 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtktoolbar.c (slide_idle_handler): use CHILD_VISIBLE
+       instead of VISIBLE to determine whether we should stop
+       sliding. (#130018, reported by Christian Persch).
+
 Fri Dec 26 23:24:35 2003  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkactiongroup.c (gtk_action_group_add_radio_actions_full): 

diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 6c574e5fe2d0ef5bfe6c5bce92d8305b1ed06778..de6014c11906fdb96540c81912f38aaf0746dd28 100644 (file)
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -1074,12 +1074,13 @@ slide_idle_handler (gpointer data)
 
       if ((content->state == NOT_ALLOCATED) ||
          (content->state == NORMAL &&
+          GTK_WIDGET_CHILD_VISIBLE (content->item) &&
           ((content->goal_allocation.x != widget->allocation.x ||
             content->goal_allocation.y != widget->allocation.y ||
             content->goal_allocation.width != widget->allocation.width ||
             content->goal_allocation.height != widget->allocation.height))) ||
          (content->is_placeholder && content->disappearing &&
-          GTK_WIDGET_VISIBLE (content->item)))
+          GTK_WIDGET_CHILD_VISIBLE (content->item)))
        {
          gtk_widget_queue_resize_no_redraw (GTK_WIDGET (toolbar));
          return TRUE;